Skip to content

Conversation

@xichen01
Copy link
Contributor

@xichen01 xichen01 commented Oct 1, 2024

What changes were proposed in this pull request?

Fix the issue that junit5 tests were not executed in CI, backport these PR to fix this issue.

HDDS-10059. TestOMRatisSnapshots.testInstallSnapshot should only validate live files. (#6069)
HDDS-10143. Intermittent failure in TestOzoneRpcClientWithRatis.testParallelDeleteBucketAndCreateKey (#6335)
HDDS-11068. Move SstFiltered flag to a file in the snapshot directory (#6965)
HDDS-10218. Speed up TestSstFilteringService (#6196)
HDDS-11084. Read SstFilteringService config only once in SnapshotDeletingService (#6885)
HDDS-10552. Downgrade Surefire to 3.0.0-M4 (#6406) (re-backport)

What is the link to the Apache JIRA

Because junit5 dependency junit-jupiter-engine was omitted when backporting HDDS-10552 (6a31ccd). junit5 tests in the ozone-1.4 branch were not executed in CI (such as: https://github.com/apache/ozone/actions/runs/11085539961). This problem is fixed in this PR.

Main changes

  • HDDS-10059 Add junit5 and junit4 dependencies in hadoop-dependency-test/pom.xml (d889984)
  • Backport some patches to fix the failed tests.

How was this patch tested?

https://github.com/xichen01/ozone/actions/runs/11126592655

@xichen01
Copy link
Contributor Author

xichen01 commented Oct 1, 2024

@adoroszlai @hemantk-12 @raju-balpande @swamirishi @GeorgeJahad please check that your commits are correctly cherry-picked.

@hemantk-12
Copy link
Contributor

Thanks @xichen01 for the patch.
Cherry-pick for #6885/HDDS-11084 looks good to me.

@adoroszlai
Copy link
Contributor

Thanks @xichen01, d889984 looks OK.

@xichen01 xichen01 merged commit e9fccf4 into apache:ozone-1.4 Oct 7, 2024
@xichen01
Copy link
Contributor Author

xichen01 commented Oct 7, 2024

Merged using:

git checkout ozone-1.4
git pull
git merge --ff-only ozone-1.4-backport
git push

@xichen01 xichen01 deleted the ozone-1.4-backport branch October 16, 2024 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants